diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 3dfefc2..bf412b2 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -299,7 +299,7 @@
 	// Is there a "remap" function? If so, we call it instead
 	if (method_exists($CI, '_remap'))
 	{
-		$CI->_remap($method);
+		$CI->_remap($method, array_slice($URI->rsegments, 2));
 	}
 	else
 	{
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index 9da1da2..56a1145 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -229,7 +229,7 @@
 get called regardless of what your URI contains.  It overrides the normal behavior in which the URI determines which function is called,
 allowing you to define your own function routing rules.</p>
 
-<p>The overridden function call (typically the second segment of the URI) will be passed as a parameter the <kbd>_remap()</kbd> function:</p>
+<p>The overridden function call (typically the second segment of the URI) will be passed as a parameter to the <kbd>_remap()</kbd> function:</p>
 
 <code>function _remap(<var>$method</var>)<br />
 {<br />
@@ -243,6 +243,7 @@
 &nbsp;&nbsp;&nbsp;&nbsp;}<br />
 }</code>
 
+<p>An array of leftover segments are passed into <kbd>_remap()</kbd> as an optional second parameter.</p>
 
 
 
diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html
index a750345..ac965ae 100644
--- a/user_guide/general/core_classes.html
+++ b/user_guide/general/core_classes.html
@@ -84,6 +84,7 @@
 <li>Log</li>
 <li>Output</li>
 <li>Router</li>
+<li>Unicode</li>
 <li>URI</li>
 </ul>